Lots of collision detection progress and some monster improvements