add getters and update comments