fixing validation (wip)