Cleaned up errors in pumps

Need to check these later too see if they actually function at all