Various bugfixes once running things, + commonizing model/view