A few top level rules reworked.