Stablility and speed fixes