fixed all the small changes from code review; have not yet refactored