Minor functional enhancements
Update comment