Some Assorted bugfixes

the simulation test had some issues that I believe this resolves. also
there are some additions related to bringing the simulation over to the
display, I have not uploaded that yet.