more things

The a-tags without hrefs are not rendering right on the live site and I don't want to hold off on making it live, so I'm including that patch again!

Plus other things.