more file-size/perf tweaks