Decided to switch BACK over to cm again, using the cm source for the m7spr as a base. Currently it builds up to the kernel, then goes kaput.