Configuration files fixed

Hadi, please have a look, maybe some of these changes are just peculiarities of my local setup