much more validations!
fix parser and interchange endinds