more fixes... i am lost!