[changed] some small adjustements