Further tweaks and enhancements based on feedback