fixed !command, minor changes