more fixes; ** means changes needed