Improved comments and other minor improvements