Cleaned up the "CHANGE--HERE", "CHANGE---HERE" and "temporary" comments. Cleaned up other stuff.