Accuracy improvements

Accuracy improvements