Fixed some bugs
Also added some fun for XP