ViewModel fixes, optimizations;