modified statistics implementations, added a limit to methods

@TODO : Add Assertions and controls