More command tweaks!