cleanup and touchups