added check to input fields
even more minor updates