allow early returns from blocks
fix queue name