only minor changes, nothing in functionality