Fixed and made some changes | ScratchStats