Corrected several points raised in PR discussion