Add captions, fix pagination, fix some TODOs