fixing OC + minor changes | ScratchStats