some minors changes