Add remaining validations, fix broken specs
Merge pull request #122 from larsonkonr/fix_validations

Add remaining validations, fix broken specs