New commit, some fixes to the models