Cleaned up the command string and added restricted commands.