some minors change