final fixes on spam filtering bugs - crosses fingers - these fixes were tested.