a tonne more cleanup of html comments and _s baggage