some minors fixes