minor fixes
validation done