Added recent tom7misc changes.