Fixed up more exports. THere is still a yuck displaying