massive reorg plus new functionality
Fix scope error handling and property rebroadcast
Merge Zach's changes.