Josh: editing and minor updates