miscellaneous updates to core files, misc fixes, comments
fixes typo
Merge pull request #1 from bredon/master

Miscellaneous updates