accounting wip: addressing review comments