Fixed typos, legacy code.