* adding BEP2 10-16 * Fixes (sanity and consistency, auto) Co-authored-by: zachzwei <zachzwei@users.noreply.github.com>