FPS indicator and minor fix