Hey,

#510 https://gitlab.com/whitebox-aero/whitebox/-/work_items/510
#512 https://gitlab.com/whitebox-aero/whitebox/-/work_items/512
Done & ready for review.

Thanks,
Avinash S.