XLRstats WiP improvements