[changed] redone few small things