Adding .exports and small tweaks