minor updates with comments, boolean type, etc.