Better scraping/misc

As the title says.

Breaks e-mail functionality, is a bit messy.

Still merging it, just for the sake of creating a good branching model.
Will branch develop off it.