Add and enhanced comments, minor changes for release