File crawler bugs and improvement