more HTML fixes
more work on testing procedure