fix some markup while we're at it