Export is now a fn, thus multiple instances can be used.
Some minor code improvements.