merged with Eliot's 333
- clean blocks
- frameless optimizations
- merged with Eliot's 406