Typos and more typechecking