Various changes based on feedback