Version 3.6.3 various fixes and enhancements