Minor fixes

Minor fixes, and comments