some validation fixes
changes for new bugs