vsync bugfix + refactoring