small improvements from Paul