waypoint & slight updates
Merge branch 'master' of https://github.com/kyleowens10/coinplay