few changes. highlighting works, mostly.