Pump management still not quite right but mostly there now!!