a lot of cleaning up, add database download

utility is getting big, fast.