Added map line and circle parameters although currently unused. refactored the movement keys