Statistics bugs fixed
Attributes now ordered