More late-night changes, working on making the EH safe by reverting the VBR when an exception occurs. License placeholders added