small changes; lots of commenting-out