Removed targets that weren't working.
Tweaked targets.
Updated tool.