fixed some markup problems