Fixed stats and various bugs