+real data, lots of minor fixes