Resolved some more problems with the general html encoding, most of which are from funny code that should be cleaned up anyway so haven't run into any dilemmas so far; still looking though so could happen