More patterns and some simplifications