Adfinder cleanup and alot of rewritten