Fix CF

Didn't account for FPS before
Merge branch 'master' of github.com:Shylight/CC-Sim