Retooled cshifts into a nested forom
Minor efficiency tweaks