performance updates and bug fixes