Update usage text and add minor tweaks.