comments, tidying, RunAsAdmin added