Updated chosen features and other tweaks