Bog fixes and improvements in beams.