Rule ID Updates

Added  missing rules and fixed duplicates.
Also removed old experimental rules.