Updated baseStats, better error handling