Update exports/imports; several fixes