several fixes
Merge branch 'master' of https://github.com/jiazhihao/cs242-types
merge