CHARMM: updated to remarks in PR