Hivefest and other updates 2

RKrequested to merge
hivefest-plus into develop

Fixed the issues that were discussed during the previous PR

Merge request reports