First batch of stuff

@himedlooff @ascott1 @contolini
Ah, I overlooked that. I thought we had taken out all endblock names. All they do is aid readability on long blocks, but we can just as easily do that with HTML comments, like we have here.