Made fixes per returned comments