Minor fixes.
Adjust which commands go where.