minors improvements