Minor bug fixes
Add sub-worklist optimization.