Worked on model and misc fixes