Touchup2

Some comments and cosmetic touchups to custom extension code.