More html marker cleanup and bug fixes.