small changes, mostly bugfixes
Merge branch 'master' of https://github.com/JamesRen/GetThere

sd