More comprehensive comments