adding updates from David Strauß and Ilia Choly