Cleaned up some mistakes in the model