several small fixes
Merge pull request #9 from odedshr/safetify-input

several small fixes