almost done with validations
fix merges