Fixed some bugs and added Models storage (hooray)