final revisions and cleanup