Fixed 11 Bugs

Also started implementing upgrades.