Cleanup and fixes for Unite - better searching with async, file, buffer