Teo round2

Merges Teo’s round 2 changes into the ItalicsDev branch.