Don't count unsubscribed members
add more robustness
bulletproofing
fix notice
Remove some redundancies