Long overdue update

Lots of changes and updates previously unsynched