Wand modified to be a bit cleaner. Makefile exporter only works without any external dependencies.