minor fixes
cleaned up / sped up horrible code
merged
Merge remote-tracking branch 'origin/ios-data-observation'