fixed typos and bad imports