more rule drafts and cleanup