Hotfix, keep game in bounds, cleaned up code.