Bug Fixes improved performance