Moved to tabs not spaces and more work on the protection system