More improvements to rollup but still not quite right