Tweaks, renamings, and comments