fixed typos, cleanup