CA correct: formatting and fixes