Updated with changes due to file manager and registry editor work.