add comment handler
fix a lot