MainModel fixes
runnable