minor fixes again!