some fixes - still broke