Add some captures and further documentation