Added class imports, updated to new Captions library, doc updates