minor fixes... again...