few minor improvements