Bugfix & more