Propulsion in regular and irregular waves