some new config options added
some fixes