added getters
fixed set