Minor improvements

I'm not sure why your commits 165ed92 and 4488c44 of Aug 27. 2014 are in there.  

Commit 79e8218- pulling 'types' out we had discussed in the office. f8dca2f is a small docstring typo.