Fix a few warnings
Fix spelling
Make method names consistent with naming scheme
Documentation