added stubs for pumps and power, added format args