added options and changed format for exports