Implemented a few upgrades, and allowed dev to turn them on or off