performance updates, bug fixes