New portion of fixes and enhancements