uat bugs and correction. routine visit and diesel visit