more spam tweaks