Merged more metrics, added movement and movement, rearranged some rules, eliminated dups.