Not quite
Fix large swath of warnings, fix most render-methods
Merge upstream