Fixed expiration, added FPS timer