Minor tweaks, marked two & three as prime