Added some changes to model and fixed other issues