Can use XP levels too + minor fixes