A bit of spam cleanup, and some minor command tweaks