added commenting and other enhancements