Fix text and add exports