Clean up a bit.
Add support for wildcards in paths.