Overall touchups

Overall touchups