add comments, sweep out old junk