some more markup fixes