Fixed collision detection

…for rects and circles. Still no rect-vs-circle.