CLI overhaul.

Minor 'gs done' tweaks.