Fixed a bunch of fixmes in Factories.py
added a few TODOs in models.py