Fix Errors until Validation, Yippee