Calculator bugs fixed, except hidding additional insrances on checkbox click (Problem is first event fires on top element).
Merge