Some fixes and changes | ScratchStats