Remaked - Fixel all errors

Done ;o