More validations & specs
Fixes
More specs