few small changes
...