Obj tessellation and various tweaks/fixes

I was asked to update this PR for 1.6 and finally got around to it. None of the relevant files were changed in the meantime so it should be quick and painless. More or less a repeat of #624