Update find-things-fast, some cleanup