pattern cleanup + 2 new patterns