more typing fixed
Merge pull request #209 from trett/master

typing fixes