renamed venti to pump, simplified and added some shorthand operators.