HP Done

Ally Sprikrequested to merge
Development into main

Pretty much all fixes implemented

Merge request reports