Fixed issue with Pee-Wee/Junior export and added fields to expoer