Fixing timing issue
Add fps calculation