Better bio/fact handling in mash