Slight touch up and updates