Error Checking
Fix
Fix stats