added input validation
validation without disabling
fixed validation w/o disabling