lots of fixes for not stomping on dataz