[all] minor improvements