Mostly improved comments