make ombudsman and remove work, fix a couple of bugs