path fixed, some old tidy up from old client fixes
Merge branch 'master' of github.com:Jimimick/EmercLibs