added or fixed a few setter methods