cluster mode, some bugfixes