changed the unicode method for entities and removed more lingering code
tested the new unicode method.