Bugfix & Comments