more tweaks to overlay organization + factory (gettin' enterprisey up in here)