Bugfixes and Added Item Upgrade Framework

Fixed A few bugs. Added framework for all future item upgrades.