changes from krestel
minor changes to fix errors introduced by krestel changes
avoid writing his stupid files to disk (in even more annoying folders) and fix regex to non-greedy
some more files he likes to create ...
seems to work