minor changes, etc