Fixed slow down.
Fixed bugs which became in my bad fixing