Lots of learnset improvements