[^] few minor improvements