improve utility
misc change
minor bug fix