keyspace construction fix and additional logging