make it look nicer :)

fix import/exports to be conservative

write tests