Fix c*r functions

Also makes an additional 199 tests pass now