changes from Kayvon and David's comments; also some color