minor changes in calc and item
merge
calc bill changed
oops