Fix Typos and Outdated Option