couple of changes based on feedback