Added statistics tracking and draw toggle