merged Dan's and Liz's doc changes