[changed] some minor improvements