Merged unrelated changes from the uniweb branch.
Brought Powerup Settings function in from uniweb branch