added href scrapping, some minor changes