working on jetbrains annotations and some view model tweaks