fixing bugs after first release, placeholders, concurrency locks