changing model name and other fixes