Touchups and cleanup