merge export & others
merge export II
quick fixes