removed useless imports; fixed some typos