rewrites and tweaked margins