attempting to export definitions to satisfy missing symbols, plus some formatting