typos and cleanups