* Feat: updated to latest hive.go

* Fix: started fixing some issued due to the refactor

* Fix: fixed some more issues

Co-authored-by: Hans Moog <hm@mkjc.net>