Small changes, few checks extra for Commenter objects