- More validations
- More syntax fixes