Update 3.5

Pushing for a bug fix. I have two more (or so) to fix and then I think
I'll push the official dev update 4