The behaviour of a ground effect machine over smooth water and over waves