trying to streamline name handling
...
ws handling improvements
...