made changes for importing and some typos for data models