Fix captions as well.
Fix some small bugs.