a few minor improvements