some minors fixed