Performance improvements, bug fixes.