Massive updates from joilaroi

VSYNC!