minor refinments