Capitalization
Call methods as methods instead of functions
TODO messages
Merge pull request #2 from fread2281/upstream-merge

More improvements