Small adjustments to association, and small bugfixes.