Feature/76 fix some exporting