Made a few more "educational" changes