Fixed hitboxes and rendering