fix export lists; add instance declarations