holoirc: fix reported bugs

* fixes #39
* fixes #40
Merge branch 'beta' into alpha