Fix bugs causing null pointer exception.

Now blank screen after one step, everything being killed?