Add education, tidy up yaml