v. 0.4.3, more sub-patterns, rename some methods