some changes

mainly validation