Attribution work fixes #39, #43, and #44