key indexing concurrency, minor bugfixes, first markup