Some old change
Tweaks
Fixed number input