Performance improvements and options. Miscellaneous improvements and support for scatter plot samples.