Updates Completed, Please Merge

Many enhancements per our discussions!