added 2 factorys

yeah and some other stuff