bugfixes, more locking integration, still major gaps