new style tweaks and performance enhancements (master)