Changes some factory things, cleaned up some stuff, comments...