removed weird file count checks, improved diff based checks