added more accessors and comments