Fixes
Validation & shit