- fix problems with labels for the new blobk-based commands
- all tests should pass now ...