some revisions for cep18, should be ready for review