improve command checking, fix google command