gosh more cc form fixes