fixes to cs1a logic