Bugfixes

* fixed problem with filenames containing quotes
* some minor bugfixes