Added stats and runcount to User + cleanup