Added url target checking, cleanup
More cleanup
Merge pull request #3 from doubledead/dev

Dev