Slight changes and touchups (OCD)