fixed all models & most views