Improvements

Simpification of configuration and some improvements.