Bugfix, documentation, configuration