1) externalized the taint wrapper for more flexibility
2) added some more sources and sinks