Modularized commenting, added queue for failed comments.