more fixes to done_val