various changes, largely aimed at using more standard Go terminology