Incorporate most recent bugfixes from master branch.
Add overlay settings to configuration file.