more markup fixes