holoirc: cleanup code and fix multiple issues