Renamed getters/setters to eras econfusion of similarly-named methods
Added and fixed up comments