Adjustments.
Revert.
Sum of updates(credits:CLANAT)
[KJ] small corrects
[KJ] Corrects