Bug fixes

also changed ms: to fps: