Some fixes. File finding still does not work properly.. Have no idea what produces this error