- [x] clean things up - [x] fix most recent merge conflicts - [ ] test - [ ] new patches conflicts - [ ] fix or temporarily remove examples - [ ] merge