new data, some rewrites
tweaks, new data