fixes (not completed)