Fixed a few things In Factory

Fixed up a few errors in the Factory