Fix minor bug
Work on export methods and UI.