various modifications resulting from reviews