latest updates to match main dashboards in security suite - merry xmas and happy new year'

also cleaned out data gen