Fixed a bad bug with some command lengths.
Cleanup.