fix import errors and typos