adding limits for inputs
adding validations and solving conflict