add education variables and various bits of tidy up