-EDITED- correct player movement