updated registry and finished integration of expert mode