last minor fixes (hope)