review comments + mapdb deadlock fix