more fixes
- adapt tool-index/select logic
- incorporate more origin fixes