improved file matching and some comments