Included config & bugfixes