holoirc: multiple fixes and refactors