tidied code and fixed some TODOs
Player stores own location now