removed some comments, added some setters