added client type converter

- other small changes