several fixes (not done)