Fixed file issue.  Think it's completely working for --single.