Fix export more

#78 has several problems. fix these.