fixes based off of comments