added a few changes based on feedback