Fixed factories and controllers for some constructor changes
fixing merges and adding new features to factory