some cleaning up in the spider. not tested. will do tomorrow