Add more comments and tweaks for PR 102