Improvements to voting BE edge cases, add fields to FE