Add P1-Pump interlock. Fixed bugs.