Added support for new sites
Fixed issue with temporary file
Added some more info