more fixes - first pass not done yet