bugfix & optimizations
MVVM fixes
minor fix