validation added
some fixes