More minor changes from second draft