Steve's factory manager bug and formatting pass