fixed the model position and some other bugs from the latest commit