Performance improvements, bug fixes.
oops