Bug Fixes and Performance enhancements