implemented Amy's latest comments plus one or two from before