Cleaning up models
Fixing bugs