Attempt to fix ConcurrentModificationException in Observer
Add checks around the billing querying
Fix problem in holograph library touching the pie graph