fixed comments, minor issues remain