Captions are back, along with a few fixes.