(Many) Learner improvements