multiple fixes - addditions