Tested grid movement and collision detection, and fixed some small issues