[PATCH] converted all CCIs from idents to refs * also adjusted transform slightly, fixed other typos