Make some changes based on feedback