few more fixes, still more to go