bugfix and comments