finder results, lots of improvements