more fixes - not quite there yet