- Added methods to backup and restore the original MAC
- Added more checks
- Other improvements