Fixing inputs, issues with yorkcalc