Merging Dev branch into Main

A few errors and conflicts were to be expected, all were resolved.