fixed more models.py bugs