Fixed import statements and a few typos