cleanup data shaping, fix some visualization plugin bugs