some fixes - still failing