minor enhancements and changes to working deployment
minor enhancements and changes to working deployment