more input field fixes
Merge pull request #6 from kcampen/input-fix

more input field fixes