a few tweaks, fixed export