Various Client changes to imporve usability