minor changes in calc
merging...