Some final touch-ups