Johns edits, small changes from lisa