bakery fixes
evline fixes
todo - from Jimmy