bugfix & typofix