Storing file names in lower case and some minor fixes