last small fixes. Now I'm going home.