fixed the straglers in the typing system