made fixes per feedback from jeads