new defaults
some fixes to broken patterns