fix spacing on CACAP, minor changes