make some updates based on feedback