Working on the upgrades

Upgrades are a little obfuscated in the original sourcecode, so it is hard to find out how they where supposed to work ;). I try to figure this out and make upgrades possible asap.