Pulled latest htmltoscraps to start to fix #332 and other bugs