Soem tweaks based on feedback.