Remove various spaces; correct typos