fixing stuff in the CA