Cleanup, addition of export functionality for elements...