Allow multiple blocks with the same name

* Do not require an END; an end of file is good enough
* Tweaked little other things