more patterns and some fixes