minor fixes again...