comment tweaks, composer tweaks, and bug fixes