Preparing for real commands, and a few other goodies.