make helper private
failing test for calcs
cleanup modules
update obs in one call
update calc on update obs, closes #608
Merge pull request #609 from modilabs/calcs-edit-del-608

Calcs edit del 608