fixes to ?, tests ok, but newstate related problem w multivalue