further minor improvements