Deactivate VSync
Fix comments
Solving merge conflicts