More suicide tweaks based on feedback