more tweaks to make viewmodel more useful