misc. fixes
clean-up
Merge branch 'master' into release/v2
new UI integration