Use explicit names in some scripts, re-organize fupd plainly derived laws, adjust wsat import/export.