Some Changes, FIxes, optimizations...

btw: I made all your .sim Files invalid