Bunch of minor modifications, including FPS fix