Some cleanup and adding of commands.