cosmetic bug fixes
more tests, less bugs in CC