More stats and improvements to accessors