Simplified commands, cleaned up a bit.