fixed some markup, etc