Fix typos and ameliorate