Whee minor improvements.