Refactor getters to become methods
Fix methods signature
Fixed some error exceptions, docs
Merge cleanup