Changes to text repr of snapshot
Add/Remove ArmorPlans + some refactoring