Fix set/get methods, comments, members of class