Hardened, corrected validation, one bug fixed