Big updage, seems to be stable
Fixed differences