Added configuration file + minor improvements.