Change text fields to number where appropriate
Change way certain input handled