Some simulation changes - still far too much to do
Color and simulation changes