lots of updates after beautifulData workshop