A few tweaks and adjustments based on feedback