First Stats clean up
Fix signature-zone