general reorganization and revisions