Check in most of the good stuff, which I somehow missed earlier
Favicon and title fix