- a few minor improvements