adjusted some of the details
few touches