few changes, mostly patterns, trying new stuff