fix some small server-side concurrency issues

update todo.txt and readme as well