Major cleanup/update per xboxfanj update