fixed issues with export etc