cleaned up some problems with the models