Changed keyspace fixed a few bugs