Some improvements you may want to integrate

The scrapping was not working properly, you may qwant to integrate these changes.