comments, bugfix