fixed comments, cleaned up code (removed commented out garbage)