link to the design doc
small enhancements