Fixes to find file and added logging