...
fix some little bugs, improve configuratione