minor comments and name fixes