took care of 1st round of feedback