add DEFINEs, tweak rollup.