converter cleanup and viewmodel refactoring
more converter fixing