fixed and tested setters