took out some comments and debugging