several fixes - part 2