bugfix comments and refresh