Keeping BEF updated to Master

Bug-fixes and the like are pushed to master, and also BEF

This mirrors all of the commits/bug-fixes on master to BEF.