view model improvements + added some todos