Add arrow keys to move Bot, some fixes for states