tightened up and trimmed another 80k of compiled size