minor changes in comments and member handling