First pass at a tweaked upgrade routine that properly sets item amounts. #83