updates and enhancements to last commit