Player clipping and some cleanup