bugfix and add comment form