Validation + minor changes