Fix typos and eliminate hypocrisy