Bug Fixes and Performance Update