Now really track the Total collected XP and not the current XP.

Also fixes YASP-242
More changes to support UUID's