Added FPS counter to top-right

And changed a tiny bit of code in the main class