Lots of command tweaking.