Changed empty block grammar and matching
Fixed more ambiguity at the end of blocks