Did some more changes to collisions, and Render

Fixed render, by adding math.floor so things line up with the grid.