implemented some suggested changes