some fixes (bug not fixed)