Made some general fixes | ScratchStats