Some final touchups