accounting wip: addressing some review comments