added cma_check and some changes to my personal config