bug fixes and code cleanup in hybrid 1P1P draft-A-CEEI algorithm