Set up a protection system map
instanceof not required  null Check
Merge pull request #61 from Superloup10/master

Misc cleanup.