Multiple UAC changes

UAC is mostly working