Minor Factory fixes, minor Tutor changes. Ready for merge