bugfix & style