fix keyboard and fix command on mac