Bugfixes and slight config syntax adaption