made a couple updates/bug fixes based on feedback