Most recent changes to stats update
Fix some stuff that's my fault in failing tests