round 2 of changes, to pages other than index