fix player movement, added TODOs in code