add util and fix some...