several bug fixes after first client test session