Adding ability to guess year from filename, some more error checking.