slowly but surely cleaning up bugs in BeamGroup, starting to feel better but that is because I am lying to myself