Fixing some bugs;  simulation is real cool now