fixed up more markup