Fixes #11
Indentation changes in configuration files
Fixes #10
Additional minor modifications related to the previous commit.