Fix more typos and tighten syntax