Add pump status and some others updates and corrections