Instructions update; autodetection bugfix