some minors modifications