fix bug, add basic stats