Fixed several scrape/output bugs.