Added more stats, fixed bugs
Temp