clean up share import now that it's non-blocking; simplifies lots of code
wait for import to finish on in found_block
fix callback
wait for import_shares to finish in do_import
a little cleanup