Fix a few issues with scraper--notably, that it now stops if there is an 'actual' error
Clean up results. Move 'result' to separate template file for easier inclusion in other (future) templates