Merge final changes from Dev-Branch into main

Merge the final changes into main.

It was a pleasure working with y'all! (unless something breaks, then we can say our final words after we fix it)