Unatteded install improvement and bug fix