fixed some typos and missed imports