Improved comments a bit