Bug fixes

- Handle special characters (white space, parens, etc) in file names
- Fix uninitialized variable (looks like I changed my mind halfway
through regarding what to call it)