Added clipping back in.  Oops.
Allowed longer filenames in inf files.  Typo fixes.