PHASE 2 INITIATION AND BUGFIXES

Lots of stuff, check the individual notes.