minor changes in testing
resolve merge conflict
make some progress on temperature stabolization, but still some problem with initial setting. Go home..
merge conflicts, hope I got everything right, but probably some misunderstanding about calcdTemp