Bug Fix's and Enhancements