Some simulation bugs dealt with...look changed