Made some small changes--make Validate more stable

0.6