Changes to get Ritchie closer to compiling
Changes match_circle to new debug and params infrastructure
Removes annoying space
Removes more annoying spaces