bugfix & new configs