correct imports and class paths and a few typos.