Spam tweaks, bugfix, huehue