Improve comments, cleanup adv mode closure warnings, and bump version to 2.1.0