More xp changes!

(I'm sure James will change a few things. ;) )