enhancements after demo + code comments
code comments