resolve warnings, add getters