issue #1027 #1028

- onAdd override was unecessary and incorrect
Merge pull request #1029 from nmccready/issue_1027_1028

issue 1027 1028 clustering fixes