Accounting is added

Some fine tunings