Things are mostly fixed now!  Still need to clean up the HTML tests.