Properly finish Input and made some all around adjustments