Adding xml/screen scraper functions and clean up