Hi Alex -
On #1 I wonder if the STATE.loadDataSource statement could be causing the issue regarding updating the data source? For reference, see Martin Kolb's blog Design Studio: Performance Implications of Variables
I am not sure on #2 - I will think about it - but hopefully others have ideas.