minor reorganizations and corrections