Fixins
final fixes on spam filtering bugs