exporting fixes, some ui tweaks