misc fixes + cluster mode