Few minor changes
...