General improvements, nearly there
Merge branch 'master' of https://github.com/Bootwhmcs/bootwhmcs