added some more validations
validations
Merge branch 'newmaster' of github.com:lemiwinks/finalproject into newmaster