Revert "bug fixes + validations"

This reverts commit 3d1ceaade4e832145f9d723c78b0236a023105cf.
fixed edit bug