Fix vsync problem

And additionally bring some stuff up to date