fixed comments and debug statements