Game loop works better now i think?
Fixed your damn merge conflicts...